#86 Fix handler