Issue 179

@rokroskar could you confirm whether this fixes your issue #179