Fix for 0.13.1