Fixed #288