Fixed #169 completely