Fix for version 0.12