fixed possible problem