#60 better enforcing mechanism implemented