#gt-146 Fixed very fast fix