Fix for Version 4