Possible solution for #82 and #85