Possible loader bugfix