Temporary fixes expiration controller