Fix for #34 (5th attempt)