Bugfix #1

Calculating off of wrong container