Fix for f7ee56eb917b0d38de0d71a223bd107407d9570b