Possible Fix

Change-Id: Ic0fb87285f67f221cb92db294d2d5e7838877c1b
Merge pull request #20 from VanillaUnicorn/2

Possible Fix