previously mentioned fixes