fixes in first step