Trying to resolve bug