Issue related to #48
Issue related to #48