Fix for building