Fixed second part of #81