feat: Removed workaround, fixes #14