Aleph again

Fix to SIFD-65 and SIFD-61