Fixed IMPALA-12 and IMPALA-248