Fix #1 (bis)

Some crappy fix here, fixed with simple alternative.