Fixes. Thanks @mbabker