Fix/check implements

This PR fixes issue #191