Implements interface and tries to fix bug