issue #27 completely fixed