this fixes one part of #207