Cleanup
Fixed issue