Re-fixed the aforementioned bug in a simpler way.