One more for hacky wacky Fix for #841