Bug Fix for previous commit