fixed similar issue as last commit