related to #48 