Fix for Martin