Fixed wrong data assignment