changed with elz's suggestion