Version 7 fix