Fixed lost handler-fn