Fixed last wercker problems