Overengineering leads to stupidity. Fix #225.