aclk assignment fix taken from 64b66b branch (Marco Trovato)

Hello @mwensing I have extracted the change from Marco which we discussed yesterday into a new MR. Please check.