Fixing the fix...

Fixing my stupid moving mistake.
Related GitHub #17

Change-Id: I9a686cdc0c7f2f40a3bc27b20ccf3471471c200a