fixing lingering problems