FIX issue #221

Didn't have time to test it.

Don't merge it without testing it (I'll test it this weekend, if someone can try before, please :) )