#rafeeva - fixes