possible fragment fix and cleanup