issue #52 implemented here