fixed issue with Dynamic handlers