Fix for current version