Fixed bug with power up not working
Merge fix