Bug fix on build