Fixes issues 233 & 234.