Another cheaty fix