(fix) Fixes #15, remove special case handling.