Should fix issue #87

@gtraxx look fine to me. What about you ?