Fixed #310