Possible solution to Bugs

Possible solution for Bug #481
Possible solution for Bug #482