Bug fix to get and main methods