Fully fix #301