Fix for 266