Fixed #511