HACK: Temporary fix for assemble issue 139

:smile: