Should also fix #52