attempt a fix for #232 - see if these are any better? :)