Fixed #007