Fix #17 for 2nd time