Fix for 227, take 2.