Proposal for better handling solves #164