Added fixes to post 143 and also fixed the fixes mechanism :)