Fixed #298