Fixed #340 again