Another attempt at disquss fix