Fixes #239

COWBOY COMMITS!