Unconfirmed attempt to solve issue #126