Fix for 0.23.5