fix lamson handlers