Fix prototype form and and property form listener