Removing `current_screen` which caused problems.