Fixed #43 - correct adapter implementation