Fixed #2