Fixes comments by @poison