Partially implements issue #119