wacky fix #2