Fix for 0.94.11