fixing stately problems