Fixed #207

Subject says it all...