fixing old bug