Fixing build #45