Fix issue #83

Try to fix #83 
Very dirty way?