Fix double-binding bug