lzap, is this related to #563 - I would prefer to keep this separate PR