Fix for item number 567