HUGE bug fixed ;) Fix #112