Try to fix #1, not tested yet.
Will be tested tonight.