Refixed issue

Author: @akshoop