Fix issue154