another problem with the previous two commits fixed