merge changes from helena blind branch
better way of fixing errors in catiline callbacks