Fix for issues No.28