removed troublesome bug