Added proper return from handle