Final Commit

One more Bug fix for Capes :)