Temporary build fix until 0.13