Fixed #124 for a hopefully last time.