Fixes #268

@SirCmpwn - clear to merge