#30 fix interface