Bug fix: Possible interpolation errors removed.

Signed-off-by: Utkarsh Jaiswal <ujaiswal.iit@gmail.com>