Fix for 26