+ working to fix the bug