Fixed issue #216 This time for real.