- previous "fix" was quite flawed