Adds callback check, removes uncessessary bind