Attempt at fixing #101 & #102