fixed defaults behaviour