FIX: Fixed compatitbility with v 4.5