cleaned up issue