fixed #9, now for real