Fixed #1048