Temporary fix - Refs #44