Fix for 585