Tested and fixed