As per #66