Author: Fix my problems myself