Fix #2 better