Latest changes. Unsure what I did, don't remember.

Signed-off-by: Michael Fabian Dirks <hellbirdxjun@gmail.com>