Minor changes in code.
OLEK QUICKFIX CHECK CHECK CHECK!