Fix issue [#308 state:fixed responsible:none]