[2] Done #GH-1 Fixed