diff --git a/Makefile.am b/Makefile.am
index ecd26602..a07b8170 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,8 +158,8 @@ builtin_modules += stemodem
 builtin_sources += drivers/atmodem/atutil.h \
 			drivers/stemodem/stemodem.h \
 			drivers/stemodem/stemodem.c \
-			drivers/stemodem/gprs-context.c \
 			drivers/stemodem/voicecall.c \
+			drivers/stemodem/gprs-context.c \
 			drivers/stemodem/caif_socket.h \
 			drivers/stemodem/if_caif.h
 
diff --git a/drivers/stemodem/stemodem.c b/drivers/stemodem/stemodem.c
index 9184a42a..cbf48954 100644
--- a/drivers/stemodem/stemodem.c
+++ b/drivers/stemodem/stemodem.c
@@ -36,16 +36,16 @@
 
 static int stemodem_init(void)
 {
-	ste_gprs_context_init();
 	ste_voicecall_init();
+	ste_gprs_context_init();
 
 	return 0;
 }
 
 static void stemodem_exit(void)
 {
-	ste_gprs_context_exit();
 	ste_voicecall_exit();
+	ste_gprs_context_exit();
 }
 
 OFONO_PLUGIN_DEFINE(stemodem, "STE modem driver", VERSION,