Fix of Release version - should be polished.