Fixed wrong properties being set