Fix #10 ; but not beautiful
thanks to b_dauphin