Fixed for version 7.7