Fixed for build #23