Fix #6 (previous commit fixed #5)