This should take care of the problems/questions described in the following threads
and @korr123's question here