Issue#4: Small fix