image fix; hint restore fix