Small fix implemented