Trying to remedy #28