Fix for 521