#11: Edge case scenarios fixed