added scala check