fix behaviour