changed attempted fixes to issues 264 and 382