Fix issue #83

Very dirty way?