reverted "fix" for issue 204, added check for 214