Bug has been fixed. Must now merge with master.