Fixed #285